Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 18 Jan 2011 04:41:41 +0000 (20:41 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 18 Jan 2011 04:41:41 +0000 (20:41 -0800)
commitbbb58ada68d63fecfd784697e130fac1ca808adf
tree0a89660e1ec31cbbff1ffe91590314a97aabc423
parent4008490cf0a75c90d61b48fc5e540be162bcefdf
parent0102c3bc19aaf7424a1fe34c479309376b46ffc7
Merge from mainline.